Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 6 Apr 2010 21:56:56 +0000 (21:56 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 6 Apr 2010 21:56:56 +0000 (21:56 +0000)

Trivial merge